Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] support batch task management by periodically polling the remote task via a cron job #3458

Merged
merged 13 commits into from
Jan 30, 2025

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 161d789 from #3421

… via a cron job (#3421)

* support batch task management by periocially bolling the remote task via a cron job

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* address comments and resolve dependencies to avoid conflicts

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* add unit tests

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* renamed files and added more tests

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

---------

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>
(cherry picked from commit 161d789)
Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>
Zhangxunmt
Zhangxunmt previously approved these changes Jan 29, 2025
Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>
b4sjoo
b4sjoo previously approved these changes Jan 29, 2025
String opensearchMlPlugin = "opensearch-ml-" + project.version + ".zip"

String bwcJobSchedulerPlugin = "opensearch-job-scheduler-" + bwcVersion + ".zip"
String bwcRemoteJobSchedulerFile = "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/" + bwcShortVersion + "/latest/linux/x64/tar/builds/opensearch/plugins/" + bwcJobSchedulerPlugin
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: maybe change the “https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/” + bwcShortVersion + “/latest/linux/x64/tar/builds/opensearch/plugins/” into something like bwcRemoteBaseUrl to improve the readibility

@@ -429,40 +479,74 @@ tasks.withType(licenseHeaders.class) {
String bwcVersion = "2.4.0.0"
String bwcShortVersion = bwcVersion[0..4]
String baseName = "mlCommonsBwcCluster"
String bwcBasePath = "src/test/resources/org/opensearch/ml/bwc/"
String bwcMLFilePath = "src/test/resources/org/opensearch/ml/bwc/ml/"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Why not use bwcBasePath + "ml/" or bwcBasePath + "job-scheduler/" here

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>
@rbhavna rbhavna dismissed stale reviews from b4sjoo and themself via fe2ad24 January 29, 2025 21:35
@b4sjoo
Copy link
Collaborator

b4sjoo commented Jan 29, 2025

LGTM, thanks for repairing the bwc, great ownership

@rbhavna rbhavna had a problem deploying to ml-commons-cicd-env January 29, 2025 22:36 — with GitHub Actions Failure
@rbhavna rbhavna had a problem deploying to ml-commons-cicd-env January 29, 2025 22:36 — with GitHub Actions Failure
@rbhavna rbhavna had a problem deploying to ml-commons-cicd-env January 29, 2025 23:09 — with GitHub Actions Failure
@rbhavna rbhavna had a problem deploying to ml-commons-cicd-env January 29, 2025 23:09 — with GitHub Actions Failure
@Zhangxunmt Zhangxunmt merged commit f083b7e into 2.x Jan 30, 2025
8 of 14 checks passed
opensearch-trigger-bot bot added a commit that referenced this pull request Jan 30, 2025
…the remote task via a cron job (#3458)

* support batch task management by periodically bolling the remote task via a cron job (#3421)

* support batch task management by periocially bolling the remote task via a cron job

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* address comments and resolve dependencies to avoid conflicts

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* add unit tests

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* renamed files and added more tests

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

---------

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>
(cherry picked from commit 161d789)

* fix failing BWC tests

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* fix missing path in failing BWC tests

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* fix failing BWC tests

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* add missing braces

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* add missing braces

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* add missing braces

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* add missing braces

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* add missing braces

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* add to yml file

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* add to yml file

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* add to yml file

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* refactored code

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

---------

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>
Co-authored-by: Bhavana Goud Ramaram <rbhavna@amazon.com>
(cherry picked from commit f083b7e)
Zhangxunmt pushed a commit that referenced this pull request Jan 30, 2025
…the remote task via a cron job (#3458) (#3473)

* support batch task management by periodically bolling the remote task via a cron job (#3421)

* support batch task management by periocially bolling the remote task via a cron job

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* address comments and resolve dependencies to avoid conflicts

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* add unit tests

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* renamed files and added more tests

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

---------

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>
(cherry picked from commit 161d789)

* fix failing BWC tests

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* fix missing path in failing BWC tests

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* fix failing BWC tests

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* add missing braces

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* add missing braces

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* add missing braces

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* add missing braces

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* add missing braces

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* add to yml file

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* add to yml file

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* add to yml file

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* refactored code

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

---------

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>
Co-authored-by: Bhavana Goud Ramaram <rbhavna@amazon.com>
(cherry picked from commit f083b7e)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants